Autogenerated HTML docs for v1.7.0.3-311-g6a6955
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 78f4714..d71607a 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt
@@ -7,7 +7,7 @@ SYNOPSIS -------- -'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] <commit> +'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit> DESCRIPTION ----------- @@ -70,6 +70,10 @@ --signoff:: Add Signed-off-by line at the end of the commit message. +--ff:: + If the current HEAD is the same as the parent of the + cherry-pick'ed commit, then a fast forward to this commit will + be performed. Author ------
